Updated from global requirements

Change-Id: If75ca1819d27df22c010b8a6e83177767a6b4b8e