Merge "Fix profile filtered loading" into pi-dev
am: 0e1f7b97ba

Change-Id: I2cb92572412487f156474ac0a65b3a2ae780c5ff