Merge "Don't rely on transitively included headers"
am: 45eeea2dcd

Change-Id: I1d822d54a1da50b99c1153335b03d68c331b8d4d