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

Change-Id: I982c4f9fa09469d4c25aa23de277a87dd7a391c2