Updated from global requirements

Change-Id: Idfb18adc471f1c280539eb30e52cd5a08594c874