Updated from global requirements

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