Updated from global requirements

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