Updated from global requirements

Change-Id: Iba8167336fc991a85c52902ea0fa5cce6b8d00c8
Merge "Updated from global requirements"