Updated from global requirements

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