Merge "Change to hide BEARER_BITMASK." into mnc-dev