Merge "Don't increment the hotness for invokes." am: 1d2d8b1b6b
am: b6b6ae3f1e

Change-Id: I8427535e427017df5427af7187a53e97dd69d48a