Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 84a268bdaa  -s ours
am: f7da4a81c6  -s ours

Change-Id: I4478ece1620ea9fe3f9b0d632c8374fb3b2addfb