Consolidate profile methods
am: a6c9b78a3f

Change-Id: Id354db042572b747a7ef210a4d3abe3e89e4f06a