Merge "Remove Preconditions, Protocol @hide usage"