Updated from global requirements

Change-Id: Ic1bea1f00e44f7d8abfed96864e0f5c8845baba1