Merge "Remove extra using statements" am: 28133def11 am: de106d8a2d

Change-Id: Ida676cfd0249a0134df4f8afa79e7e9bfd42721e