Merge "Data profile refactoring"
am: b551d0d6d3

Change-Id: Ibb6374fab2282a5db6d4f931c53ce8a1a0811988