Updated from global requirements

Change-Id: If825146d176803117e5dfda21b5818b2d5a642d2