[2/2] Privacy guard from Cyanogenmod

Change-Id: Ib884916ab090500aa1ed5656d2283a2b4685a82e