Merge "Do not resolve caller_ns when it is not needed" into nyc-dev
am: 5b19771009

* commit '5b19771009d4eb6dfc1e560ceff608cc06050137':
  Do not resolve caller_ns when it is not needed

Change-Id: I8a9cff79a15699a9806e26b2efbdbb390280fdf6