Merge "Remove unused import"
am: ab81538d6b

Change-Id: Ia8bf5f99ccc30540041e004224ce7cd456ec0faa