Updated from global requirements

Change-Id: Icfd1ce9d60179bdc839ccd88e14df0fef098ad4b