Import translations. DO NOT MERGE am: 71d91cce0d  -s ours
am: 99a94ff383  -s ours

Change-Id: Ie3a068140fd3bc24646d3455c27030d191f3ce35