Remove extra using statements am: fea435cb04

Change-Id: Ied816c6386175833a919a44cd6f33120eb791678