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

Change-Id: If0b034b6cf443db146984905882965ee8cddcff9