Merge "Fix typo that causes brigtness to be wrong." into honeycomb