[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 6a40932ee2 -s ours am: 1735eebfc9 -s ours
am: d7a7742162 -s ours
am skip reason: subject contains skip directive

Change-Id: I84e525f285d8ee5f31aa862d528704e9531ecc05