Merge "Guard against a NPE when using ParceledSliceList" into nyc-dev