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

Change-Id: I45ebb9332b5aa628d1fd4838642d1ef2083b7ab9