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

Change-Id: I234a4fcd8343ce446f8820327cb69cb9ea8a117d