Updated from global requirements

Change-Id: I791782c6d508c04485e8ce55c7d7b6cbdf6e9cd3