More CM PrivacyGuard fixes.

Change-Id: I0c0ce36b18bf6bc8995139c24c7ae42277595387