Add back privacy guard manager.

Change-Id: Ic9fbbae137bb8425fe72a6cdb2f17117351b5709
Merge remote-tracking branch 'github/kk44' into wszf
del

Change-Id: I96de37739e2bd84ee81d6b7bec8f5c6d60eae776