Merge "Add check for slot index value" am: d8148b6c8c
am: e7d03a6ff1

Change-Id: I57c57b70484ec0c08bcd7b02e880fbe28e2cde9e