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

* commit 'd6c480efb4fa5d4ca8cedef5ccec4bf763d467ba':

Change-Id: I7e68cd1d4a0eb3c9ec2e7eb62b3bd881fbe3df8a