Revert "Revert "revert privacy as a main setting header.""

This reverts commit beff6ff9b06779e207d86fa1dd16acbab7d00c58.

Change-Id: I88b65c703363a21a31460bea0927fa0669ffedac