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

Change-Id: I3f30ea8f624d7768a1759dc0294103620b38c77c