Trim unnecessary includes

Change-Id: Id985d17e1baff2cebc3878b4c596c4852c7d4ed0
Merge "Trim unnecessary includes"