Updated from global requirements

Change-Id: Iebbd358fe62880e2b7376c0da802dd73383c012c