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

Change-Id: Iaec2a90c6de37fa16a0e9b78f4665bbf63cb4aea