Updated from global requirements

Change-Id: I0b2152153a2ea35193140c999dcf061051484861