Updated from global requirements

Change-Id: I12b8c0a7e35ec8e7b683c6bd90eca35039496e56