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

Change-Id: I74871fd9c3630192efcce5bae68c2b34aeed7d45