Merge "CDD: MUST NOT send user's private data off the device without the user's consent" into pi-dev