Import translations. DO NOT MERGE am: e6327db2af  -s ours
am: 925f4f35b5  -s ours

Change-Id: I83edac364921df0c78e2bd37399fac6a530dd43b