Merge "Stop using trigger_reset_main." into qt-dev
am: 9db42907b5

Change-Id: I18181feec3c637cc295411e017ebf5e3fd204702