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

Change-Id: Ida1b49e4ed6d460b72490bc08ca37c9cc9919203