Merge "Enable profile data filtering in profman" am: 527984ac73
am: 185ff20f68

Change-Id: I34f9e63b00754462529cd38884d4b3ca6339cf92