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