Updated from global requirements

Change-Id: I64f1e98ee67a8da95efdbe0f9c83f665daacb183