Updated from global requirements

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