Updated from global requirements

Change-Id: I610a3529fdb636d71520b801af5277d6bc8e556c