Merge "Add METADATA to jdiff: LGPL+GPL=RESTRICTED" am: a62cf319f0 am: 1508d2b9c7 am: 95d5f57b36 am: 5ae69e87ab am: 2545b2cabc

Change-Id: I339f8d9b0fcd6990c0f96d5d982b42005eb54923