Merge "Prevent leak of sndmonitor resources" into oc-dev
am: e46a28d3c7

Change-Id: Ia0e831cc93dd9099ac0e6c90ea95b85ae8eafdf1