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

Change-Id: I35f5bdfbed56c4d969f98962ff1b4174554704ae