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

Change-Id: Ibc67b9df07c31fa32cb5b1e3d5612359a472c253