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

Change-Id: I238edde273910201169320e0dc9d2415f8cde5c0