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

Change-Id: I41cd5388f08bdb400616d4e459db04353cf37915