Merge "Add some null checks to slices" into pi-dev am: 0689312acb
am: 9473edd1da

Change-Id: I4f87ba2997047e0721a0c1e9ce3f4047af17c709