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

Change-Id: Id936f04e9b54b565547b612cc341f9b7672bb186