Merge "mcp: Fix possible null pointer exception"
tree: 544110d3f4138507d49daf70cdf74453ad63996f
  1. android/