privacy guard

Change-Id: Ib84f0aa1ea21f156c8135c9fb21aadbd0790cde7