Fix up deps and unless clause for privacy policy import.

Change-Id: I9c45729a563b0fd05b8e8e12560d16191ffef504
Merge "Fix up deps and unless clause for privacy policy import." into production