[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c70114e46b -s ours am: 2e6afa3dad -s ours
am: dee799816e -s ours
am skip reason: subject contains skip directive

Change-Id: I4d19374409ef0541012a60b35760b1d81a3f9cc3