Merge "Add METADATA to media: BSD+MIT+Apache2=NOTICE" am: 8bc12867 am: 5a55889b am: ea6c3e6e am: 229a2dda am: da4eb324 Change-Id: Id9f3f54e9887e8beddf0488da0b5efc5f2ba1136