Updated from global requirements

Change-Id: Ide0e95f47a88015801e445c1cd659f30c51e0c0b