Updated from global requirements

Change-Id: I1687d51bddb873549163dcf488fc40cdd9edcb29

Change-Id: Ic4a43955526fcde313ad2f2afec8fafeb87f37a6