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

Change-Id: I981da4f46ca026860d349452d79874b09f5e1052