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

Change-Id: Ie53e2ff8faee4d666794931f907ab9995a54588a