Merge "Video source test & bugfix" into nyc-dev
am: a1c06675dd

* commit 'a1c06675dd2a83ce445f27b46cddab80f8c743e6':
  Video source test & bugfix

Change-Id: I0205afb269ade5c45c19df082e56955bf6bc93ca