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

Change-Id: I80a88123b16c54734306da7e5dc0670972041648