Updated from global requirements

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