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

Change-Id: Ic61743485a957f0f63dfb5db1da4265a08e92ffc