Updated from global requirements

Change-Id: I0ef20ae378115f801d144c99f0e14712c55504de