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

Change-Id: Ibf067cbbb041d0f0e79afbe554438d571f9a8d3e