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

Change-Id: I6389a0fa23cbeab2d2005f5546ba31bcff559415