Import translations. DO NOT MERGE am: 4c22470  -s ours
am: 4a4f2fb  -s ours

* commit '4a4f2fbcdab61c8061d5be7bf8d33b9bb4b9a97b':

Change-Id: I849000811a2055682036431ed3e82a637a7ee81f