Consolidate profile methods am: a6c9b78a3f am: f9ca77a03d
am: 13c84dc073

Change-Id: I97e3eb25133a688cb1079e5cada44679011b4b23