Updated from global requirements

Change-Id: I446a5ace72727d1e1c8fecdc6e38ccd35d2fa599