Merge "Use handle uri instead null if caller info lookup is not done" into lmp-dev