Updated from global requirements

Change-Id: I62acdf7b4a394a9811679fab68e57d4b5e50d4d2