Import translations. DO NOT MERGE
am: 4877206e7b  -s ours

Change-Id: Ia3d62385373a134c656e6c78e6a5a8ad5c6722bc