Merge "Handle type annotations when generating cache keys" am: 255b001fc2 am: 221404f748
am: b8cc40eb32

Change-Id: I1c009c553c7121396f0f0712991db5efc0c7370c