[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 48de73d2bf -s ours am: 36fe996360 -s ours
am: d814d68a19 -s ours
am skip reason: subject contains skip directive

Change-Id: I02c962bfd1db24b6908c9ec8bafabd3b008ace1b