[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: e4792b3964  -s ours
am: 483468f6d9  -s ours

Change-Id: I167eef8a8571b13487fd2739b2127a3311bc9ed2