Updated from global requirements

Change-Id: I07bbc04b6ac1849339392a4f3b0924756b06052c