[automerger skipped] Merge "[DO NOT MERGE]Add check for slot index value" into pi-dev am: dbf0f79d4a -s ours
am: 8c8249d1ac -s ours
am skip reason: subject contains skip directive

Change-Id: I7688e90ce2a3a661ba7bcc6ef9d824722ed23f72