Updated from global requirements

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