Updated from global requirements

Change-Id: Iedcf94964907d2682df9f329b617b5d45e3f9667