Updated from global requirements

Change-Id: I2fde69ec4a89d6627b5e7172fe38ebde622a0dca