Updated from global requirements

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