Updated from global requirements

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