Updated from global requirements

Change-Id: I52962d1bf30fef1491b66cc1a5cb3ea8c32d3c57