am: 5b197710 * commit '5b197710': Do not resolve caller_ns when it is not needed Change-Id: I8a9cff79a15699a9806e26b2efbdbb390280fdf6