[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 61719eca99 -s ours am: 7e22de9e62 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic6e1c6883bcb24c12945ad4430810d772ba47680