[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f98c32434b  -s ours
am: 3c4b5b9719  -s ours

Change-Id: Iee70d3baebfba3bd4466a50892a954d0888aa1b2