Updated from global requirements

Change-Id: Ie4b40c04509a4a6956760eb9ec59fd14e958b722