Updated from global requirements

Change-Id: If1dcbdac845f846151dc9b79dbf59618b9171062