Updated from global requirements

Change-Id: Ia93e9fd3554e9550b1386436c3ab49e894e8f197