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