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

Change-Id: If890060c0bd388c6159cea6aef4a6d58a46da5f1