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

Change-Id: I923e5377a1abe761217612452cbfdba752e53de2