Updated from global requirements

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