Updated from global requirements

Change-Id: Ie0ee5ee6026913c6e220b1f7cd0c740a7e2a5af5