Updated from global requirements

Change-Id: Ibfbe0027a4dca1ca8faf4bd604d8caf05aa72881