Merge "Prevent NPE for MAP profile"
tree: 4d24144f5208137aa58ae668af2a9b123864db24
  1. android/