reduce the size of Env by one pointer (cherry picked from commit 83f5622545) Change-Id: I5636290526d0165cfc61aee1e7a5b94db4a26cef
83f5622545
I5636290526d0165cfc61aee1e7a5b94db4a26cef