There was an update 4.10.12-200.fc25.x86_64 after which my suspend problem went away.
CMOS battery is very deep under the motherboard. It would have sucked big time to replace
As far as BIOS option is concerned there was only which was to block S3 sleep which is
what I wanted to work. I did enable and later disable it. I am not sure if that has
anything to do with it.