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

Change-Id: I3a0085c58a6296891879dfa9e3db1a82633cd161