Updated from global requirements

Change-Id: I0265bf9b08541ad769c53bed224cf71afb47f119