Updated from global requirements

Change-Id: Id9bbcfd2164856dbc80b72ace08e9ad5c30d841d