[automerger skipped] DO NOT MERGE Revert all scrim related changes in qpr am: f97d7f73cf
am: df1a2a031d -s ours
am skip reason: subject contains skip directive

Change-Id: I69e1ea1816d2e3c492d8190884b0a7104a295fb7