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

Change-Id: I603e609a6068e53f270eafefcf56dcaa496db12a