Updated from global requirements

Change-Id: Ifd361a1dc84ff2e2dfb780003d0825f709a258e4