Updated from global requirements

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