tweak recovery params and fix reboot to recovery

Change-Id: If5ab827a9936256601749964b2e8c5e9c956d647