Updated from global requirements

Change-Id: I8b01e858112587b04be68acaecd9bd0b1044ce37