Updated from global requirements

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