Updated from global requirements

Change-Id: I79f8c2d0c9ff616b771d9e7268e39f2ace014836