Merge "Remove unnecessary includes" am: 1ab2344f6d
am: 111bdeeb16

Change-Id: I28728701f8d734dea9e66c79bde3d092600fd182