Merge "Allow playback state update even when there is no metadata"
am: d1d01c397a

Change-Id: I1d86216b161da4f0e5def877412f532128ae3490