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

Change-Id: I79b9ce817c6a95fc17795db59af83000dd1cd6dc