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

Change-Id: I44ff2e1e8e8ac394a10b23e4227dbe7ecede5732