[automerger skipped] Merge "Pass sessionId instead of whole object during...

[automerger skipped] Merge "Pass sessionId instead of whole object during pre-reboot verification" am: 1704f5c9 am: 40106f56 -s ours

am skip reason: Change-Id I4cff8060aa1600c505531f00986ebbeb523c07c8 with SHA-1 6dc9889f is in history

Change-Id: I7e4747c229fd2df8b6df2c674b4d1bcf9deb7f05