Merge "Revert "Add camera app op - camera"" into mnc-dev