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

Change-Id: Iad9e375a533af62f1fd553c5d09fef7002f109ed