[automerger skipped] Merge "Catch exception when failing to create slice" into pi-dev am: 524babb389
am: f060f89b6f -s ours
Change-Id: I0ae2d9494634c7bb98b28a9022e4177f54a6414e
This commit is contained in: