Updated from global requirements

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