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

Change-Id: I68915d6190faa22e20b03321dc5895a37e6de5f8