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

Change-Id: Ie66f108c2d2afad4b22e19abf591114338e21dd1