Updated from global requirements

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