Updated from global requirements

Change-Id: I24eb06d606da77da15945f3c06adebdb4ed39905