Updated from global requirements

Change-Id: Ia0877019bb2567823222da8b8722ed8a7a19346b