Updated from global requirements

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