Updated from global requirements

Change-Id: Ieca8fe381805c032c8cc2fdf6ce3bc2020b8549b