Updated from global requirements

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