Remove unnecessary 'using' directive am: 928facdec9 am: 82a39a0d83
am: 61dab9abea

Change-Id: I495001ca59d5e1ff619650f4d399534e24ac90a4