am 6086365e: am 9c08f6c8: Merge "Camera: Add XML entries and files for new...
am 6086365e: am 9c08f6c8: Merge "Camera: Add XML entries and files for new system features" into lmp-mr1-dev
* commit '6086365e':
Camera: Add XML entries and files for new system features