Merge "DO NOT MERGE - Update night display coefficients" into oc-dr1-dev am: 153d2ff6 am: 53a3bcdb am: 6bbf3014 -s ours Change-Id: I99c66e7fd56a23e95157810e018f46fa40953bdb