[automerger skipped] Merge "Don't use apexName where apexBundleName is...
[automerger skipped] Merge "Don't use apexName where apexBundleName is expected" am: f4839227 am: a0be49cd am: fd74d2ad -s ours
am skip reason: Change-Id I4aaf674a5daeabab5ed6e7025c5389821ee9a013 with SHA-1 be95e6b2 is in history
Change-Id: I12350d85f257a6bd85c5987927e1cc6520b05a0f