Android S Beta 1
Merge "Add METADATA to markdown: BSD=NOTICE" am: 28656a77b2 am: 24b5e54d6f am: 69cf566550 am: af40c0da89

Change-Id: Ib3432f9d76040cb644894e7be8f49b4ffeffa208