Updated from global requirements

Change-Id: I951b387904be3c4f14fbdfe157ecc1d14a79498a