Merge "Add METADATA to markdown: BSD=NOTICE" am: 28656a77b2 am: 24b5e54d6f

Change-Id: I1f0d9fa3c6183769c2352b9b9692eda5f5810a34