Clean up profile AddMethod APIs am: 1061c7d2bf am: db21ecb0e0
am: 8c945757de

Change-Id: Idbb969630c2f784e923097407e378e27280d0896