Updated from global requirements

Change-Id: I270cf1c21f7d6d3b491715ebd6a0767133556c86