Merge "Merge "Merge "Add check for slot index value" am: d8148b6c am: e7d03a6f" into pi-dev-plus-aosp am: 894ee44b"