Updated from global requirements

Change-Id: I447396a42436e9ce24db7363c48904e744da4143