Updated from global requirements

Change-Id: I92740aa7f7e88e7a4db78f2fb4a184561cd92408