Updated from global requirements

Change-Id: I2062b461b01d7651609e01a4432c545806162f11