Updated from global requirements

Change-Id: I32dd2462ed298a1cdda478ca44774c7e5d345c99