Merge "Do not populate SLOT_KEY with wrong slot info" into qt-dev
am: 5a3afc8ce7

Change-Id: I7bea85b6f657a24b7d8b4292f83ef2f27d79da1e