[automerger skipped] Merge "Use slotId -1 until cardId is fully ready." am:...
[automerger skipped] Merge "Use slotId -1 until cardId is fully ready." am: 5ad1c1ca am: b490cb90
am: 03a15a48 -s ours
am skip reason: change_id Ifbaf7959ed12e4dcdc0e283b7424d564716251cc with SHA1 6cb84a9c is in history
Change-Id: Ib3c01564bb218cc7a6cd9080d88bb26544f266b2