Updated from global requirements

Change-Id: I5206a2e69f84a3d05249dcc1d8653d27240a192c