Updated from global requirements

Change-Id: Ie4d964feb6111f173338e510ed83d7f1d79f7dbb