Merge "Add logging to capture wifi enable" into jb-dev