Updated from global requirements

Change-Id: I8721d3215fea6d3b34d9940a7ae39e8e11279f30