Updated from global requirements

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