Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 81abcfea7b  -s ours
am: bb7bad413a  -s ours

Change-Id: I82a6ab8827a3b8416d797493f07f0b036af8d4ea