Privacy guard stuff

Change-Id: I1d5207d24cb114abeab58d48a5aac5956911eff7
Signed-off-by: Evan Anderson <evan1124@gmail.com>