Merge \\"Use videoView.start instead of videoView.resume.\\" into nyc-mr1-dev am: c60d2cf3e7
am: d8fd2558fb

Change-Id: I51c92e00baf48aad983a9e8a24d4a7b59087cdba