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

Change-Id: I6ebc82f3feff22872f2a94f6f52b56300a096517