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

Change-Id: I92760f5f871c5ef7b07e9273ceed6fcaa340f853