DO NOT MERGE: Add proper @hide's for mismatched released APIs bug: 7538348 Change-Id: I1c7f9207149888f8595f5a1ce4147cafb7410b99