Merge "Adds sanity checks to session commit and abandon" into qt-dev
am: 116ca5db5b

Change-Id: I2be2b6bdf8fded0689522bcd3f288ac9d01ef0c6