[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: cd994c83 -s ours

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

Change-Id: I69bdf9d48d712f67a4a9683040987f3565ce2df9