Updated from global requirements

Change-Id: I72045d8a7b5abbd6ad6b9a01f9a5fa653c37b464