H.R. 5682, the “FIRST STEP Act” and H.R. 5698, the “Protect and Serve Act of 2018”