[automerger skipped] Merge "[DO NOT MERGE]Add check for slot index value" into pi-dev
am: dbf0f79d4a -s ours
am skip reason: SHA1 dbf0f79d4a skipped by user mberionne

Change-Id: I74f89c391a079b57a36ed79a97c63f5e96e8d7c3