Updated from global requirements

Change-Id: I985865a921f0ef1997eec9b407e7d5c24ce96f39