Updated from global requirements

Change-Id: I6141613ee0a5b9fb769b165e42872edd99b7ff0a