[automerger skipped] Merge "Add the actual slot ID as an extra" am: 1c72edec
am: ac5dbdc2 -s ours
am skip reason: change_id I7d91ed09a169e719876c56764cbdc9c159fc2f60 with SHA1 f6c61098 is in history
Change-Id: I8f4103d7dcd428bfe5e12aa17725aa0151acc205