Merge "Hide API not ready for prime time." into mnc-dev