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

Change-Id: I0776f438cafc52c71216c3f3f276d39b358737ae