(cherry picked from commit 0f777aeb50)
0f777aeb50
Submitted by: Ard Biesheuvel. (cherry picked from commit cd91fd7c32)
cd91fd7c32
(cherry picked from commit ddb6b965da)
ddb6b965da