Fix expected results for huge_enviroment

Change-Id: I278c6c5efd5848f47e7b6ed246aa27a7c49462e8
Merge "Fix expected results for huge_enviroment" into stable/4.1