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

Change-Id: I12f2a0e8d75e593ac046368ee94d1f8d183d6ded