Updated from global requirements

Change-Id: I619dc5bfdea2d7897da3d62466fe968ba71add5b