am af2e7bc2: (-s ours) am fdb15a76: (-s ours) DO NOT MERGE: Mark new util type...
am af2e7bc2: (-s ours) am fdb15a76: (-s ours) DO NOT MERGE: Mark new util type functions as @hide in AOSP.
* commit 'af2e7bc2':
DO NOT MERGE: Mark new util type functions as @hide in AOSP.