Updated from global requirements

Change-Id: Iad84ddd6a436e8e5384c56b723cf74c1ec18ef34