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

Change-Id: Ifdb12beca52d86abf771c16c5f317f9d5e8e161c