note that arch-x86 has it in 797351fd3b Change-Id: I34c5d0b6887bdc7bd3411a837f90e6788bdf7ff4
797351fd3b