Merge "Refactor and improve logging." into oc-dev am: 8926f1bb11  -s ours
am: e7aa4a7951  -s ours

Change-Id: Ifc0c60600e4d24913803b0e03f8fd50cf64a921f