Merge "Add METADATA to ppp: contains GPL=RESTRICTED" am: 875e4995a8 am: 3d486b5dcd am: 8d27a16557 am: abef44ccc1

Change-Id: Ib64d48065a20aba5339df88f36e9274828a0a342