[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 8ca170d09a -s ours
am skip reason: subject contains skip directive

Change-Id: I31038cebd26164946a45e18565f88efc11331dac