[automerger skipped] Merge "2nd attempt to fix Slice strict mode." into pi-dev am: 7d214f99ee
am: 5c688f3eae  -s ours

Change-Id: I829a50c864c978bd3cf03dff925676e2bf7d4b46