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

Change-Id: Ie4dd5ed1cc33e5c7fcb1a076468208c94db45bcd