Reopen and freeze again for build.1

one emergency fix

Change-Id: I02a28e190f7a84d4a1f7b55372b7704208c44bb5