am b3bb6fd5: am b25181aa: Merge "Fix the issue the video can\'t start to play" into honeycomb-mr1

* commit 'b3bb6fd5e3050b6d17bc1a58906ea04e97a29e20':
  Fix the issue the video can't start to play