Merge "Add handleTrustStorageUpdate" into nyc-dev