[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: 55581952 -s ours
am skip reason: Change-Id I1733405526764272beba63470a9bc8a958d41024 with SHA-1 0d3c2e13 is in history
Change-Id: I327a1cf41bed18175c561e81fd8956d2a4dfb0ea