Updated from global requirements

Change-Id: I570292fd3963c0f7a5aa789cf45b1fbfdbadc0da