Updated from global requirements

Change-Id: I59350ae2e7bc421fa736b8419f39c740af2ce80c
Merge "Updated from global requirements" into stable/icehouse