Merge "Merge "Fix leak in ScrimView" into oc-dr1-dev am: 20b9b73e80" into oc-dr1-dev-plus-aosp
am: 80b9c95cd6

Change-Id: I5d795d383fa49a9a9bc34f97117599779cf51859