Updated from global requirements

Change-Id: I7e507d79d908c2330741f0ec012053c13c7e0fee