Merge "Change MetadataListener to a abstract static class" am: 9d3ce3e55e
am: 745c6de6eb

Change-Id: I796dfccf741a1ef6c45d804772415ed198e8e8d1