Updated from global requirements

Change-Id: I2b51d0622e9fe0a232f9879a1c04d7eee7c7b638