Merge "Add METADATA to mockwebserver: Apache2=NOTICE" am: a72b6a4e4d

Change-Id: I030a20d1e36415648f6ee65ee43a0c7ebf0bfff4