Updated from global requirements

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