Merge "Include missing headers" am: 1bbe51d0b5 am: 9cf1bbb045
am: 92863322a5

Change-Id: Ieed4e62a8046212eeb3afc0dd3b659d6c0fe4fff