Extract common behavior between Module and Import am: 0d3c2e13 am: 8bf22015 am: 5c702055 am: 0e04458f am: 5f6a9eb4 Change-Id: I6f040fa6a6c448d01bc9f03a036146dd8ac33e39