Merge "BlockedNumberContract API changes:"