Updated from global requirements

Change-Id: I136c85c90c5ad716d53d9b1cb2483b14725767e3