Updated from global requirements

Change-Id: I9dab787a11f6cf22b7ab57ee0fce2333ec0de43d