Clean up protected apps code (1/2)

Change-Id: I711089894e18f60028fa3bc66eea491c89da5070