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

Change-Id: Id49df5e9e2f9c366c0f6148b3310097db88864d5