Merge "Set DEBUG to false for BrightnessMappingStrategy." into pi-dev