Also includes block error. (This patch is mostly cherry picked from commit db7192e0b0) Change-Id: Idef18f90b111a0d0c9546543d3347e551908fd78
db7192e0b0