Merge "Merge "proper cleanup onDestroy" into oc-dr1-dev am: c8f40de2dd am: f70945be53" into oc-mr1-dev-plus-aosp