Updated from global requirements

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