Updated from global requirements

Change-Id: Ie7adab6aeff344c91151b4df6a55e5adb9d8333a