Updated from global requirements

Change-Id: Iee5554ddc36e58163d260175964dad8b759c94ec