Updated from global requirements

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