Merge "Add logging to CallerInfoAsyncQuery" into nyc-mr1-dev am: 0fe683da4d
am: 1925215258

Change-Id: I5b7465487520fd6432584a6589bfb0d3193a132c