Updated from global requirements

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