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

Change-Id: I8c92e825ca07c1d0fb51df8a5676b463929a7b64