Merge "Add StorageEventListener.onDiskDestroyed()" into mnc-dev