Updated from global requirements

Change-Id: Ie61f01cff77498039bb050f4e70b74622e527e20