Merge "Fix checker expectations around environment uses."
am: 43fe48fc17

Change-Id: Id8f4fb0d997ca27416a6fbc3f694d5be16da4a67