Updated from global requirements

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