Updated from global requirements

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