Updated from global requirements

Change-Id: If919044ee7fdb604cf632f4efc4865af9289bb2b