Updated from global requirements

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