Updated from global requirements

Change-Id: I284910789fe9edc44850eb62d4677c8896bd4649