Updated from global requirements

Change-Id: Ib5194aad4fe4c50f1499438b0959d1458fa6e3e3