Updated from global requirements

Change-Id: Iedf0c7f3592011c26343481fcb2a5354d6bd9c15