Updated from global requirements

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