[automerger skipped] Extract common behavior between Module and Import am:...
[automerger skipped] Extract common behavior between Module and Import am: c8f2f186 am: 648d2798 -s ours
am skip reason: Change-Id I1733405526764272beba63470a9bc8a958d41024 with SHA-1 0d3c2e13 is in history
Change-Id: I2bb818d398554ff9a143ff39ac5a3153e5cccc93