Merge pull request #16925 from dmarcos/bug980094

Bug980094
Bug 980290 - [Camera] Bytes and pixels shouldn't be used interchangeably