Merge "Fix onMetadataChanged listener failure" am: 8d6d51cb74 am: 2fe8433a76
am: afaa9f92c3

Change-Id: Icd84e9aad765fac1edc8a94a06509f9b0995d571