Merge "Ensure that we always set the method hotness in the profile" am: f1c29aa501
am: 43bb529f99

Change-Id: I0f52ce5d48625eb9f0447b56b86498e6a448b101