Updated from global requirements

Change-Id: I6a64142799a7ab6a1b2a46a023150abf09e37a85