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

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

Change-Id: Ib4c2d067ec151904048cfb4a54b36d0398d1a670