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

Change-Id: I99c7199e7a037e123a6a66e442874c86780def6b