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

Change-Id: If55719d7acdb6f6fe7aa9364515d85365787818b