Updated from global requirements

Change-Id: I64b96621d0d7a0205c80991819c259c3bb69a2d7