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

* commit '55e5cc0ea20f1cbfe71b76b3d3975dc02e061f4c':
  Don't flatten nullptrs

Change-Id: Iec33d48b249219e4db7fa9107e030837c7f93fc3