Updated from global requirements

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