[automerger skipped] Extract common behavior between Module and Import am:...
[automerger skipped] Extract common behavior between Module and Import am: c8f2f186 -s ours am: 952025f6 -s ours
am skip reason: Change-Id I1733405526764272beba63470a9bc8a958d41024 with SHA-1 c8f2f186 is in history
Change-Id: I80ea02ea8d8f1f89c56da5b19602febf24c9f09d