Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: e948fe0769  -s ours am: f6136af68f  -s ours
am: 1cee40b172  -s ours

Change-Id: Ie581bd19e8d8aea5a5e9a186b1962b38ff486723