Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: da696a6d9c  -s ours

Change-Id: I678bfc3f73fcd3ba021313201af7534f8559f8f2