Updated from global requirements

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