Updated from global requirements

Change-Id: I1d672847adfe9263307dd1f811a3e5ee6a6c13bf