[automerger skipped] Merge "Do not populate SLOT_KEY with wrong slot info" am: b3fded4d
am: 15df31ba -s ours
am skip reason: change_id I84bd4c6bc4277e32cee9916dd18dd80948a808a0 with SHA1 656f6f8b is in history
Change-Id: I60959f15c0b8b07f02b2be443dbb4a6291691ac1