Updated from global requirements

Change-Id: I934f67643ed407ef3f12a9a2d0d9f695cb88038e