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

Change-Id: Ife6711c5e0ad5180ce805c8e1df02487c2a957be