Merge changes from topic "am-96a5eb3e-2317-4e97-b0f7-e4891ab64c97" into nyc-mr1-dev

* changes:
  [automerger skipped] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" skipped: 2e2293b8 skipped: 5d8ba5e9
  [automerger skipped] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" skipped: 2e2293b8
  Revert "mm-video-v4l2: Protect buffer access and increase input buffer size"