Import translations. DO NOT MERGE
am: 993d69b795  -s ours

Change-Id: Ida08f49e9ab7d9aee42ea7fc10aed7e1005d7688