Merge "[automerger skipped] Merge "Use ApexInfo.moduleName" am: 760e80c1e9 -s ours am: a3c24462e8 -s ours am: 207dc1d938 -s ours am: 625460279a -s ours am skip reason: change_id If0bd3d368c7373ab0028211a8a4246a9821893af with SHA1 ec67395d7d is in history"