Merge "Add METADATA to media: BSD+MIT+Apache2=NOTICE" am: 8bc12867 am: 5a55889b am: ea6c3e6e am: 229a2dda Change-Id: Ife9e3832a2e340c02d5129686e35f9d6ace05b0f
mentioned in commit a92e0ab9