Import translations. DO NOT MERGE
am: 00afe024b9  -s ours

Change-Id: I96cb6689b67a3d3302d0c62feb7e26961db3b371