Updated from global requirements

Change-Id: I5fe5a2d38871bec2796c0b42a02ecc061db9ebbd