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

* commit 'eecb302cf86b09488003e1428aa5319cc472c8ed':

Change-Id: I0ae222e6ff0fec811f7b7c5dbd1e652c77251771