Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev am: f98facc3b8
am: 835f5e41de

Change-Id: I8d62b640ac73f8a71931722a837726906ef2e49b