Import translations. DO NOT MERGE am: a2e0f770d3  -s ours
am: 55646fbd97  -s ours

Change-Id: Id3233e9ba8a79ab3b1d3dfa577ac7fff9a6f1411