Merge "Revert "Enable diag_mdlog on device logging service by default"" into jb-mr1-dev