Updated from global requirements

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