Import translations. DO NOT MERGE am: 836e990  -s ours
am: 506affb  -s ours

* commit '506affbcb1294c7ad6b432d7e53bb1994aca58ae':

Change-Id: I9da35d221be5aa121a04708ed930f0f16a7c3819