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

Change-Id: Ie5c1ed7f8cd06897c2266d3466b087e2f504837c