Merge "Improved logging." into nyc-mr1-dev am: 510a91a9e6
am: 68a14874b3

Change-Id: I7e435db8b37d18db13cba88c3466ac372cd4d41b