BUG: 111000656 Change-Id: I54c612b38c10aa57839720db57d5d868271f0886 Test: Local build and boot on qemu-2.11+dfsg-1 (cherry picked from commit 522ce610)