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