Revert "revert privacy as a main setting header."

This reverts commit 72a08a4624242d3e54bc2669081e253f4b0873a3.

Change-Id: I749bcab11f7a08e049be1c93554ad18dc17b19c5