Updated from global requirements

Change-Id: I2eea528d12ed7e4cf87da19ee05fd49acf4f44a4