Consolidate profile methods am: a6c9b78a3f
am: f9ca77a03d

Change-Id: I3bfc6074d6d9b1f65f58e2817039d0fcca3593e3