Updated from global requirements

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