Merge "Move typing policy to AOSP"