fix import issue

Change-Id: I48e76ad3dbd8ab53a757601c8a64e87fcc4dac6f
Merge "fix import issue"