Updated from global requirements

Change-Id: Icedcd7285cd13d9b4e480e9ee4800f22d3804c7c