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