Merge "Fix events/<key> folders not being deleted during onDestory." into rvc-dev am: d28d403f8f am: 9a358e3fa1

Change-Id: Ia013b979c7e52f7843133e13ba80cef0f161ac44