Updated from global requirements

Change-Id: I21d9dbd6214db6abac5f7312a3e93e25b0338ebb