Updated from global requirements

Change-Id: Ic3b93f1556d23833eb0c82146c55c1e940bb155f