[automerger] Merge "Clean up for ENV_OUTSIDE_TEMPERATURE" into pi-dev am: 6db591368f am: a25e2d2692

Change-Id: Id4826f3e5b4fa731d4f9a386e8b5476c42b29e50