Hygiene: Use our own custom reset file

Address some reset related FIXMES

Change-Id: Ia83d09eca3dab87a9b960bb11f74178b142a6682
Merge "Hygiene: Use our own custom reset file"