[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 5f8b350796 -s ours
am skip reason: subject contains skip directive

Change-Id: I4edd96eb1244c14f2fdfe416920b63ea3d5df471