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

Change-Id: I3479cdef58329701a6df8dbefa05b93d6e48798d