Merge "DO NOT MERGE - Update night display coefficients" into oc-dr1-dev am: bdaada0af9 am: 0caac28160
am: 6291c93107  -s ours

Change-Id: Idf4006f4668762dcd374c34615fcc57d7569d5b8