Import translations. DO NOT MERGE am: a4e78d242d  -s ours
am: a379685253  -s ours

Change-Id: Icb5a3589fb6a0333a4a5c8a75e6c692943e1ada8