Updated from global requirements

Change-Id: Ib4377d74f62035f6462669cdd257ae0f9140a637