Import translations. DO NOT MERGE am: 11fdfbdee8  -s ours
am: 531bf87dda  -s ours

Change-Id: Ie92ebc652432c94f4ea462bd2c71c7ad16dd469d