Updated from global requirements

Change-Id: I0f1dc68b65c279cdfa5f57c867898778ba3e07e3