Updated from global requirements

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