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

Change-Id: Iad3080ae3daec6cc8e098892fdaf9436be054df4