Updated from global requirements

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