Updated from global requirements

Change-Id: I708fe9d2f10e53d61e67130ff41b0f92cddef64d