Updated from global requirements

Change-Id: I94d62c58c6003ca0ec3427f3fdf1c5c3f9d19a94