Updated from global requirements

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