It fixed bug #21659
Signed-off-by: NMa Ling <ling.ma@intel.com>
[anholt: hand-applied because git-am is too picky]
Signed-off-by: NEric Anholt <eric@anholt.net>