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

Change-Id: Ic4811e92f02e406a12f785319472d7e5cc30f1ad