DO NOT MERGE Revert all scrim related changes in qpr
am: f97d7f73cf

Change-Id: I283806af08af94d90408761e318285c9c725bf55