Merge "Fix onMetadataChanged listener failure"
am: 8d6d51cb74

Change-Id: Icc6f2dd8bfa2b9f0ed37167b1b08a5b769549864