[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 48de73d2bf -s ours
am: 36fe996360 -s ours
am skip reason: subject contains skip directive

Change-Id: I8f48142dc45512cd11a76ca997d512e6c62d08b5