Updated from global requirements

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