Updated from global requirements

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