Updated from global requirements

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