Merge "Remove unused include" am: ff3b334724 am: 7e60466a00
am: 52e88aa89c

Change-Id: I0ea0ba5eb808c7025a63cbba956c49bbeaf5967e