Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev am: f98facc3b8
am: 58d7a76e8d

Change-Id: Ie155db391504fc788036c2a9defae375b6a0b510