Remove extra using statements am: c863f7ed1b am: 00176c716a am: 42cb0aaf5f

Change-Id: I177155aaf52ef2f6f72f0bb6e48d37540f83de70