Updated from global requirements

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