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

Change-Id: If93733b781a81a55cb7369de13d351471feb6c00