Updated from global requirements

Change-Id: Ia41e1b50bad1f4324cca56a76b6989ccafa5506f