Privacy Guard Upgrades

Change-Id: I21837a806ab1bd7d677d567bcfbb39603de350d6