Updated from global requirements

Change-Id: I17eb73af82040f806b34358ac9dbde9de04cdc76