Import translations. DO NOT MERGE am: 225c634f99  -s ours am: 41e378d12c  -s ours
am: 9b33478680  -s ours

Change-Id: I42ad1fcf105462e8bcbabd01d09f0a440d0a7d63