Merge "Remove unnecessary includes"
am: 1ab2344f6d

Change-Id: I5a656c5878ad419e8373ae6711d55015de26e84b