Merge "Remove unnecessary load class for new instance"
am: a70a2e18ee

Change-Id: I2cfc4ee43377801e37815a9fda35657ccca1ca1c