Revert "Reland "Fix spacing and header protection for All Apps" after QPR1 merge"

This reverts commit b62d134124a004769bc566845d6b2ed6babc5998.

Change-Id: I9bddce4fcf70a1b3d0d958c9b73232787b3b78f8
4 files changed