Updated from global requirements

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