Updated from global requirements

Change-Id: I5d0640917fff38e25e9fa484bb16d35ffc89a2a8