Updated from global requirements

Change-Id: I67709b017e7b14114f365db2c0c044f17b307638