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

Change-Id: Ib7c624d3b5e952d2313a7caef24bcdf80155a892