Import translations. DO NOT MERGE am: b4fc70cf71  -s ours
am: ab00ba951b  -s ours

Change-Id: I51f3819f3fb8e915848e985cbf27aa19964a0065