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

Change-Id: I1bad62a475cfd38db7e7f5e75dc6c5addd2b9425