Updated from global requirements

Change-Id: I9ff09bd79cfa5422e75e21463ac3d7085f20d721