Updated from global requirements

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