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

Change-Id: I441ee4252fc955c9b7ea79a2ab4a86266ce5f207