Updated from global requirements

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