Merge "fix: cannot determine the type of modules with class 'samples'" am: b1331938a3 am: 0871e0029f
am: bc10ee9771

Change-Id: I2a382c162c67244cd11c44cd481e1a8a44f045ab