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

Change-Id: I27eb64cf167014ec22ab28c1d6d7016b28bf02ad