Import translations. DO NOT MERGE
am: 3110ccca8d  -s ours

Change-Id: I556a4c16a7f90901d429919ce4f7f0c924aa4b0c