Updated from global requirements

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