Updated from global requirements

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