After doing some cleanup, it looks like shutdown was starting to take a long time. Did the following figuration change.
Refer: https://blog.imposeren.org/2016/11/how-to-fix-ubuntu-1604-hangs-or-very.html
$ sudo edit /etc/systemd/system.conf
Uncomment the following line and change it from 10 seconds to 5 seconds
[Manager]
DefaultTimeoutStopSec=5s