Merge "Add METADATA for webrtc"
am: a95c577462

Change-Id: I3628dba33bb3f3593eb4b5c66d595f3f02575c38