Updated from global requirements

Change-Id: Ibd5e12f7a33667d93e2fc99d79a11cff44c3b884