Privacy Guard [2/4]

Change-Id: I6e091dcceee516f1f4b9bd9fb528afcf3059e874