Updated from global requirements

Change-Id: I420b04683bb53ac13240f2653de0184060a3e1f5