Merge "Fix cleartext default for the manifest value" into pi-dev