Added Privacy Guard

Change-Id: I4da3b72e5529511f56bdeab19229f821d0103007