[automerger skipped] Merge "Data profile refactoring" am: b551d0d6d3 am: daae1f5265
am: 697a064562 -s ours
am skip reason: change_id I04b910f8e349e8b7819ff058bf37ad06c3fd9adc with SHA1 af6b47af54 is in history

Change-Id: I8d2b53183505be5754232689e8e17696a62a8758