Updated from global requirements

Change-Id: I987bba775032d57dc39ea0ba75168a836cc16843