Merge "DO NOT MERGE - Update night display coefficients" into oc-dr1-dev am: bdaada0af9
am: a9a5c9f017

Change-Id: I1e1d318334514e63092dfb56b8f9525468244472