Updated from global requirements

Change-Id: If277564c8c0c839d821c0ab48bf9bd163171fe4d