Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 2c6f7366fc  -s ours
am: 2c57ac25c6  -s ours

Change-Id: I71ff293a1279cd06e1cb063cc2c22db160cd31f0