Updated from global requirements

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