Updated from global requirements

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