Updated from global requirements

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