Updated from global requirements

Change-Id: I8df925dc23eaae9d6866ad9dffbb4f255fedf1ab