Import translations. DO NOT MERGE
am: 3ed385256a  -s ours

Change-Id: Idb17affa2264a9b46343c3bc9dea1978e5a92a32