Updated from global requirements

Change-Id: I8766fb156411e3deacc7d5e1b76a302f9bb78aa7