Merge "LiveSession: Fixed a bug that set invalid metadata key for subtitles." am: 3d514b7634
am: 0a569e1766

Change-Id: I04366b8df0c39cc550e07f54873b59a01e32c6fd