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

Change-Id: I053ae8195314198edb8729521bf47a089390a301