Fork of stock lollipop recovery