Add privacy guard support - Credit CM
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>

Change-Id: Ie2af3be9d8f048a8c97bb7819475b4382d896fb4