Add some additional logging.
(cherry picked from commit 0fc3600b85b29d43530e466b2fa428e511e154c3)
Update fmj library for logging changes
(cherry picked from commit 6919d8d67db3d67708cc6d155d87828f51e978b6)