[automerger skipped] Merge "DO NOT MERGE Revert all scrim related changes in...
[automerger skipped] Merge "DO NOT MERGE Revert all scrim related changes in qpr" into qt-qpr1-dev am: 39195ba2
am: db59aba5 -s ours
am skip reason: subject contains skip directive
Change-Id: I178eca4ce0739bfbc2d49c0f85654dc14a805a93