Updated from global requirements

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