Updated from global requirements

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