am 64dd4754: am 63742fe5: am d2a04e1e: Merge "Move typing policy to AOSP"

* commit '64dd4754e3da0b43ad83e891f8dcacdb0e0c37dd':