Updated from global requirements

Change-Id: Id2a4b5b967d3d580f227ee8715d797cbbcfae174