Import translations. DO NOT MERGE am: 02799d57d7  -s ours
am: 11d3b2db21  -s ours

Change-Id: Ia8345aa02bb8f30d93c81878dff1a2a08bc86cf2