Updated from global requirements

Change-Id: I302b2ba8b4d608d689cadbf8e5b4bd29764465e3