Updated from global requirements

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