Merge "Revert "Convert assumption to conditional in freezer test"" into rvc-dev am: d6956d77 am: 5c067e27 am: 3dd01be5 Change-Id: I0cbeccd10abc7e4a3ed98a471ee052fc063b0cbb