Updated from global requirements

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