Updated from global requirements

Change-Id: Ifa3413813acf3d5b1d619907469bb129e320200e