Merge "Remove extra using statements" am: dfe39fcd17 am: 71ac225527 am: a2a87aefb8

Change-Id: If0a9369ba356d9964f56847f64ab0121b293ab69