Merge "DO NOT MERGE : fix useless import"
am: 473b3b7f03  -s ours

Change-Id: Ic717c478266a317fab1c618bc2a894e6610ffdd4