Updated from global requirements

Change-Id: I9d453b1270f82821273b1cc654e031599c1f9f77