Merge "Camera2: Fix OPT level logic" into lmp-dev