Updated from global requirements

Change-Id: I35d8272c7109722fa165f9d50f31beb31b068dbd