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

Change-Id: I5b63c45dbc6340fe58b070a0ab19e3be87ad6128