Import translations. DO NOT MERGE am: 7100f8157d  -s ours
am: ae57e2f654  -s ours

Change-Id: I425c4a18c6f096537690f703a24e1dd9790f7442