Updated from global requirements

Change-Id: I409f22e804eb9c6257f22ac7550e3bc3ad810848