am 8b9a5ad9: am b2ee64ed: Merge "Fix regression with hardware layers." into honeycomb

* commit '8b9a5ad9d552ce23d489dc5d47ef986dbe45f4bf':
  Fix regression with hardware layers.