Merge "Revert "Added safeguards for pushed brighntess curve."" into pi-dev
am: f0e720ecde

Change-Id: Icc7904bc7c284e06b9bfa5f5145c46571ea7273b