Import translations. DO NOT MERGE
am: e6b5a4bf3f  -s ours

Change-Id: I03174f51aa31d9e84c6f23e6fb09a5eef987e1ac