Updated from global requirements

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