Merge "Stop using trigger_reset_main." am: 91a6c016ec
am: 19e74b3d1f
am: 676e2e0221
Change-Id: Ib3abd85f2335968ab3845df52451148b68fd3ccf
gugelfrei
commit
62fc1b5a0a