Merge "Implement address consolidate callback (2/2)"
tree: 6f61691198091b89a32969e8f6bd27b44e630294
  1. android/