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

* commit '7c7ea3a9b8c353e45d212d95ca64463a07ffe08f':
  Don't flatten nullptrs

Change-Id: I24d406522ea814037af60e74de40d746f1eff02b