Import translations. DO NOT MERGE am: 5098e36f01  -s ours
am: 3f2418976d  -s ours

Change-Id: Ic4323799ecae40a257fd3e68380550efe70d9a2d