Merge change 970

* changes:
  fix the bug of testStartupTime in MediaPlayerPerformance test throws exception for an existing table