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

Change-Id: I797a398fa2f86357afc6c9fdc05166303db326d5