Merge "2nd attempt to fix Slice strict mode." into pi-dev
am: 7d214f99ee

Change-Id: If0e5bec4bc187f4e77848a1af2fd861f8bb7cbdb