Updated from global requirements

Change-Id: I67a599e362685f7990175fb5668e6909d670a225