Updated from global requirements

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