Remove unnecessary includes

Change-Id: I123a51675418b248306ef0b175e57e39e019916a
Merge "Remove unnecessary includes"