Updated from global requirements

Change-Id: I1bbc85d15d5b8fcf503d1990b660e43d9ac742a0