Privacy Guard

Change-Id: I5cf7249a021798c2cf3451c86a6d8b1b36f2400b