Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: b14cc5cb65  -s ours am: 65b4198de0  -s ours
am: 4a10e7ff30  -s ours

Change-Id: I67b5fa22c3611b69009491546cd5ea684fd32507