Updated from global requirements

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