Updated from global requirements

Change-Id: I9b3b71715741653185de7a05c090d8171e1f702d