Merge "Fixes bad merge in Assistant Handle logic" into qt-dev
am: b349bcf5a5

Change-Id: I877da3cfbe94dabbadd2cba899d66c004939b642