Merge "Update freezing notes." am: d05127d16d

Change-Id: I8b119bcf8c51da2e5f0589402ba6851b23546cd3