Updated from global requirements

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