Updated from global requirements

Change-Id: I202f437148746759d3eddce23abe7d334e75e6a8