Updated from global requirements

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