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

Change-Id: I75fc8e73f448ffee44a28149843c1d08399e255e