Updated from global requirements

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