Merge "Add METADATA to display: BSD+Apache2=NOTICE" am: bdcf2543d7

Change-Id: I188194156fe7f126dc03c59809a05a388aba19c1