Merge "Data profile refactoring" am: b551d0d6d3
am: daae1f5265

Change-Id: Ie04247ed0d8f6cb1139309a808ab2fb15ebcbade