Merge "Fix regression with hardware layers." into honeycomb