[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: eadfdeb249 -s ours am: 254132b362 -s ours
am: 1da3106efe -s ours
am skip reason: subject contains skip directive

Change-Id: If41a15026e5a343049aade9a006a95c53d2d17aa