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

Change-Id: I3b639554d12898708f2b0e8f101b4850e878ac62