Merge changes from topic "wait-for-staged-session" am: 5a8283d7fd am: 786db5cbcb
am: c0b79d055c

Change-Id: Ife42d5f11f08ccd6718af3995cec684848b1adf4