Updated from global requirements

Change-Id: Ib55be13e1d43e9c10a1443ec3fb9a51b471ac05b