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

Change-Id: Ia72b109a0814bbbd8b774a30ad8aa9512a516986