Merge "Fix validation problem in PhoneNumberRange" am: 85d5a309ca
am: 97fd2d5686

Change-Id: I8c6bb6a8e62c1f27213d5ee898f69de811180c17