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

Change-Id: I3d4c999516a0ae711703e68c48624e03128946e2