Merge "Add METADATA to camera: BSD+Apache2=NOTICE" am: 8bf17a6d8e am: eab4e8afd8 Change-Id: I0fbea96263cf1e9a308f458e92f02663f63ea98d