[automerger skipped] Fix the physical slot validation and add unit test am: c1e044a4
am: c06084d4 -s ours
am skip reason: change_id I40f8359b94d270d54eca118be655517b4e178d34 with SHA1 46293417 is in history
Change-Id: I7b901e1ac0f403339f8fb290c6f2396d505adf1d