Updated from global requirements

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