Import class and not object

Change-Id: Ib30a7c086e8b86eb22a0ba17e9b569aa137c40ed
Merge "Import class and not object"