Updated from global requirements

Change-Id: Idca967cc3e818774cbcf22da3670dfbf428f9e13