Updated from global requirements

Change-Id: I0112be5d9aa95f21fcf2f1b2bafd325cc39737bc