Merge "Fix some NPE issue"
tree: 95b1a432e643ea96aec382321226abd0d8ab7447
  1. nearby/