Updated from global requirements

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