Updated from global requirements

Change-Id: I58714f27507e2ec1117e23577ab082341b7a032b