[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 4d1067b315 -s ours am: 530d5efed9 -s ours am: 06f95ff0b7 -s ours
am skip reason: subject contains skip directive

Change-Id: I39271631c6955b754ec6efdd34024dc21c52b6ad