Updated from global requirements

Change-Id: I075601606a1b0c616c32fd921069b4b81a635f37