Updated from global requirements

Change-Id: I2b6ec6d6b629020ceda6f02313150fc034146232