Merge "Merge "Add check for slot index value" am: d8148b6c8c am: e7d03a6ff1" into pi-dev-plus-aosp
am: 894ee44b53

Change-Id: I9e90faa04a0da3bcbbbdbc7e96f322540434bc64