Updated from global requirements

Change-Id: I1eaaad18e3fe9c0510496e3c691c26fee4da8545