Merge "Revert "Convert assumption to conditional in freezer test"" into rvc-dev am: d6956d77 am: dfdd3868 Change-Id: I904d219e14212733169aa2082ae66d09f35b1c66