Comment 25 for bug 1664602

@Dave

I was wrong, you are right, it's not a clean cherry-pick.

I picked 7ac8b7abdb8d903c83fa15cfd952316e824fe6f3 from nvme tree (which can be clean applied) instead of bd4da3abaabffdd2472fb7085fcadd5d1d8c2153 from master.

The later one's diff contextually depends 8a9ae523282f324989850fcf41312b42a2fb9296, which is not a functional dependendency to APST, so the conflict can be easily resolved.