Merge "Ignore HasAlphaLayer flag to fix b/30929229" into nyc-mr1-dev