Updated from global requirements

Change-Id: I8538b74fa298228fd458f12b5effbfb6ff223a01