Merge "Remove hex encoding and password adjusting now that patterns are '1' based" into mnc-dev