Updated from global requirements

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