Updated from global requirements

Change-Id: I88db5273d3ec0f70cf2eac3003c8753f2f6be8b2