Updated from global requirements

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