Bug 961070 - [Camera] Addressing code comments after bug 959890 merge
Merge pull request #15472 from dmarcos/bug961070

Bug 961070 - [Camera] Addressing code comments after bug 959890 merge