Updated from global requirements

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