Updated from global requirements

Change-Id: Ic042a64906cf69214261d6651787c08c6f025ea5