Import translations. DO NOT MERGE am: ca913a6107  -s ours am: 3349e61941  -s ours
am: 397a5e8808  -s ours

Change-Id: Icb4f9997e175d4ae5e8dfbd1aaa12a698f62cba4