Merge "Include missing headers"
am: 1bbe51d0b5

Change-Id: I7e859a2afadd4c5221f07901fdff0d9715e0d285