Updated from global requirements

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