Added Privacy Guard

Change-Id: I8751823fae0e933f5a8006b49d53e82992b4ca00