Merge "DO NOT MERGE Revert all scrim related changes in qpr" into qt-qpr1-dev
am: 39195ba211

Change-Id: Ib8f292c600dae30fc160ab3ab00b188773e911e5