[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: a737ae8f0d -s ours
am: 850e3c7f69 -s ours
am skip reason: subject contains skip directive

Change-Id: Icb701eb3f7e6b62e832eebf534d83108281363ba