Updated from global requirements

Change-Id: I67edfc5009aac754e736d4a68622cebfb95ca8d7
Merge "Updated from global requirements"