Updated from global requirements

Change-Id: I7e4d84dc6c45c1220766261363f2fabc5085fe31