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

Change-Id: Ibcca137cf78b49cfb0e3b8edfc9257f4d22f3941