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

Change-Id: I1e8bf987a9b5dc1c1758f3d3d56858056f328ebc