Clean up protected apps code (1/2)

Change-Id: Ic077da86cf52594da6641a91de069d10ebf0ffd8