[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 2d0b6317b0  -s ours
am: 89d9dd0ca9  -s ours

Change-Id: Ice4d8415296a79029619d9b404ba36ed32364f5c