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

Change-Id: Icc804513288dc8553546107672616d53deba7462