Merge "Reset session for augmented only on manual requests." into qt-dev
am: 2e45d4fb47

Change-Id: Ifce0caff4f1646c93b7dbd896b03b85099e056fd