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

Change-Id: Ie9eab942ea837e8ec9f6cea2a9ccd1718452ed23