Merge "Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev am: fd6b3c6da3 am: 550d5da702" into oc-dr1-dev-plus-aosp