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

Change-Id: I5468f139776a9038e81a4ac438050363c7d255fb