Bring in Profiles support from mr0

Change-Id: Icae838838ce2c34aec22c50f166b957205db8394