Updated from global requirements

Change-Id: I0628d1071955a7f82efd1e1e054fa38ae1dff006