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

Change-Id: I435010db7eda813b36221090cc1e10a27e79480e