Updated from global requirements

Change-Id: I4f219ee8a9369928944187a4c11e7deb12a5de43