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

Change-Id: I990d05d007ffc2b9a42dcb760fa9d1ffd2ab3db2