Updated from global requirements

Change-Id: Idfe89f355afb6476a93513af0e4ce0f9e1b1e602