Updated from global requirements

Change-Id: I3745712e9c9e01408f04fb9462e6c73a991ea6fb