Updated from global requirements

Change-Id: Ief18f4f1ffff2d1f89a36181595e9b10c7cb5d87