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

Change-Id: I0bcc471a971e6d098cc89d368064c014453582be