Updated from global requirements

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