Merge changes from topics "adbd_reboot", "adbd_verity" am: 18bbb2d821 am: b555d6ba5d am: e1aa3b380e
am: 5f58046009

Change-Id: I87375994beb685ae06152f302b9f260a47aa10ec