Updated from global requirements

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