Updated from global requirements

Change-Id: I9b3bd9e3818fcf4d60757be3b02abf622d6a9f3c