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

Change-Id: I4312444eee42943fcb68f1e43f82d2b4f997464a