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

Change-Id: If27b4e737b93fd1452445fc2e3b9f84dfc621b25