Merge "Fix events/<key> folders not being deleted during onDestory." into...
Merge "Fix events/<key> folders not being deleted during onDestory." into rvc-dev am: d28d403f am: cfdc90b4 am: a6ad18ba
Change-Id: I71b1aa33abc1dc498641e67cd61b46fb69e798d4