Merge "Add logging to CallerInfoAsyncQuery" into nyc-mr1-dev