Updated from global requirements

Change-Id: I81a9287f629efb2b4005b60a80351b74e020e67c