Updated from global requirements

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