Merge "Remove VIA methods that are hidden in API version 23." into mnc-dev