Updated from global requirements

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