Updated from global requirements

Change-Id: I0456dea975c2ce3d45caa9c1813a8ac9e966976a