Updated from global requirements

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