Merge "Raise API level to 23." into mnc-dev