Import translations. DO NOT MERGE am: 661db9ffb1  -s ours
am: 1608c9536c  -s ours

Change-Id: I1f3b6ee3ce978b40ea5b522bddfe946b551f5c13