Merge "Camera: Fix a description for MONOCHROME camera capability" into pi-dev am: 8be1197c5d
am: 3995b3ff9c

Change-Id: I66a8d3f31cdaa0a96a4eb991f1f6ab7fb2e8a32c