Merge "Align with metadata API changes"
tree: 1f0ef905aefca26d6daa60b78cec2970322f1509
  1. android/