apply fix for bz 1147998 f21 qcow2 image

Change-Id: Id7bfc57bc2f166c409e15b76e1550d4f22f08ed7