Updated from global requirements

Change-Id: I1b784397aad4f29cdfbffb2742bf7dcdfaf83abc
Merge "Updated from global requirements"