Updated from global requirements

Change-Id: Ifde266cc299d94a742cd8b76f15bd1f990336d25