Merge "Actually @hide unwanted capability methods." into pi-dev