Merge "update_verifier: Add some missing #include's." am: 05f9a8e100
am: 6105a6fb6e

Change-Id: Ic511d7e2b7043905e3025493e7ad0cdb3fb05d62