Merge "Update freezing notes." am: d05127d16d am: be4fc8b108

Change-Id: Ia857cb01e876ef23107a7a9a893f894a4fb8465e