Merge "Added slot id in the internal API"
am: 045ff781b9

Change-Id: I4222766dbd47c731b1612f9d4405375a7b4dd499