Updated from global requirements

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