am 8a12ccd2: Merge "Freeze environment reading after saving deps"

* commit '8a12ccd282f6d64266bb487d247305df48487f53':
  Freeze environment reading after saving deps