Merge "fix missing headers" am: 10be5075f2 am: 7180e89fd2 am: e169ccc7f8
am: f3ab3d7c1f

Change-Id: I6e8f00a8788fbbcc09cc93b3e0d5f550cbc0a489