Merge "Unhide constants related to type annotations" am: 8ac0f45384 am: 505b90ad5c am: de1db61758
am: 9a33f3408e

Change-Id: Iaf3c083849d4712e5245f4cc62b403dded17a9be