Merge "Enable filtering of profile data on load"
am: 13a677c555

Change-Id: Icb0cfa72aec2ddfd87bb19d36a0365df2571df62