Merge "Update profile api" am: 4f4c05addb am: 7425059fc9

Change-Id: I40d4b126bda90a0bc5725325f84b15c99823dcdc