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

Change-Id: Id07dc49ffb15810fa5449901822d0d3510408589