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

Change-Id: If4813dc7a9a3da842b0ea8b5ed27275168af83e5