Updated from global requirements

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