Updated from global requirements

Change-Id: I3443352b9ec847534cf4016dc540da769501593b