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

Change-Id: I2ff7f7feb7738f8b259409fe6b4d8970b889903c