Updated from global requirements

Change-Id: I23f9349d04ec0e54321dce5fc6c88bcb8f289dec