Updated from global requirements

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