Updated from global requirements

Change-Id: I6083acfcd1e6f1cf8712beab8fbb9a0612b47dad