[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 2ea36ff2ef  -s ours
am: 11e027de9d  -s ours

Change-Id: I957dfc9bf401d27acfc4dd65a5a5f15c3ed7a20a