Merge "Add new bucket above high brightness for "sunlight"." into oc-dr1-dev
am: 5898d52184

Change-Id: Iec3589b58bf218f9bae61de60cb0a90ff2932277