Updated from global requirements

Change-Id: I9a48d7388515daa61e4fd7748480cfe1fb11aaaa