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

Change-Id: I2da9eedbb2e4f341e84424601062999ab7f9b72c