am fc00b6aa: am 90ea4c4d: Merge "Fix crash with HTML5 video." into ics-mr1

* commit 'fc00b6aac4a5f9222d36b7db5209bca9b63b55d6':
  Fix crash with HTML5 video.