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

Change-Id: I03c7fd04b80549b0b3f3b681b659df8ba8d34a68