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

Change-Id: Ie9ea712256e499bfc237373d470679c855b9729d