Updated from global requirements

Change-Id: I8ba2d8fe0ae0d1c4aa76207e3522f9c487d8cf9d