Updated from global requirements

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