Merge "Fix error case which session change request failed when pausing video" am: 9cd154587c am: ddc9143616
am: 02f02dca41

Change-Id: I94cd8a07ac50179b71ab6ec646d8a42955d3d9c5