Updated from global requirements

Change-Id: Id5be92b2293361153686da4143c0eb0a39dad4be