Updated from global requirements

Change-Id: I4ebbbc4237baaba099b65579c33be33edbe1557b