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