Updated from global requirements

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