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