Updated from global requirements

Change-Id: I1c2823c416cebfdd5662b4c1a309c24bea237ba6