Updated from global requirements

Change-Id: Ia3c7b629d48d97fdc4a12cb32d3bb42444ca4202