Merge "Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 1536c4ed80  -s ours am: 5dfa99ab35  -s ours"