(no-ticket) More data in environ

Change-Id: I11c87f03c731b7efdf0dbdb5e415fd13740ec8b7
Merge "(no-ticket) More data in environ"