Merge "Don\'t flatten nullptrs" into nyc-dev am: 55e5cc0ea2
am: 5f309cac66

* commit '5f309cac66f5124f35dc6e3033d55bdfa1af627a':
  Don't flatten nullptrs

Change-Id: I345281a4a791e1bb7e27eb48c97e68e8f127f1b6