Merge "Remove extra using statements" am: 28133def11

Change-Id: Iab0964273993949a3eb3c0c331eb58bc75e3c5e1