Merge "Add METADATA to mtpd: Apache2=NOTICE" am: c1d42e2bde

Change-Id: I28c5f2cdcbe0ecdbd7bb6b19fe7e24a67080bb78